From 3cb8d7932b7502cc33beb849d9529a20e550bdcc Mon Sep 17 00:00:00 2001
From: Mary Strodl <ipadlover8322@gmail.com>
Date: Fri, 3 Jan 2025 08:56:16 -0500
Subject: [PATCH] rust-bindings: upgrade gir and dependencies

Signed-off-by: Colin Walters <walters@verbum.org>
---
 Cargo.toml                   |  6 ++++--
 rust-bindings/Makefile       |  6 ++++--
 rust-bindings/sys/Cargo.toml | 23 +++++++++++++++--------
 3 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index dc87f948..6816b605 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,7 +9,7 @@ name = "ostree"
 readme = "rust-bindings/README.md"
 repository = "https://github.com/ostreedev/ostree"
 rust-version = "1.70.0"
-version = "0.19.1"
+version = "0.20.0"
 
 include = [
     "/COPYING",
@@ -36,7 +36,7 @@ members = [".", "rust-bindings/sys"]
 [dependencies]
 base64 = "0.20.0"
 bitflags = "1.2.1"
-ffi = { package = "ostree-sys", path = "rust-bindings/sys", version = "0.14.0" }
+ffi = { package = "ostree-sys", path = "rust-bindings/sys", version = "0.15.0" }
 gio = "0.18"
 glib = "0.18"
 hex = "0.4.2"
@@ -99,3 +99,5 @@ v2022_5 = ["v2022_2", "ffi/v2022_5"]
 v2022_6 = ["v2022_5", "ffi/v2022_6"]
 v2022_7 = ["v2022_6", "ffi/v2022_7"]
 v2023_1 = ["v2022_7", "ffi/v2023_1"]
+v2023_8 = ["v2023_1", "ffi/v2023_8"]
+v2023_11 = ["v2023_8", "ffi/v2023_11"]
diff --git a/rust-bindings/Makefile b/rust-bindings/Makefile
index 652d7e46..ae677431 100644
--- a/rust-bindings/Makefile
+++ b/rust-bindings/Makefile
@@ -1,5 +1,6 @@
 GIR_REPO := https://github.com/gtk-rs/gir.git
-GIR_VERSION := 0eeebbdf9d4d5a0b0148c7fa055bf961e16e54a0
+GIR_VERSION := 5433e2582f831d551789ee95fa04188d2a5fd3e5 # 0.20.4
+GIR_FILES_VERSION := 0.19.0
 OSTREE_REPO := ../ostree
 OSTREE_VERSION := patch-v2022.2
 RUSTDOC_STRIPPER_VERSION := 0.1.17
@@ -35,6 +36,7 @@ update-gir-files: \
 	remove-gir-files \
 	gir-files \
 	gir-files/GLib-2.0.gir \
+	gir-files/GModule-2.0.gir \
 	gir-files/Gio-2.0.gir \
 	gir-files/GObject-2.0.gir \
 	gir-files/OSTree-1.0.gir
@@ -46,7 +48,7 @@ gir-files:
 	mkdir -p gir-files
 
 %.gir:
-	curl -o $@ -L https://github.com/gtk-rs/gir-files/raw/master/${@F}
+	curl -o $@ -L https://github.com/gtk-rs/gir-files/raw/$(GIR_FILES_VERSION)/${@F}
 
 gir-files/OSTree-1.0.gir:
 	ln -sfr ../OSTree-1.0.gir $@
diff --git a/rust-bindings/sys/Cargo.toml b/rust-bindings/sys/Cargo.toml
index 901b5612..4a6f007b 100644
--- a/rust-bindings/sys/Cargo.toml
+++ b/rust-bindings/sys/Cargo.toml
@@ -1,19 +1,16 @@
 [build-dependencies]
-system-deps = "6"
+system-deps = "7"
 
 [dependencies]
 libc = "0.2"
 
-[dependencies.gio]
-package = "gio-sys"
+[dependencies.gio-sys]
 version = "0.18"
 
-[dependencies.glib]
-package = "glib-sys"
+[dependencies.glib-sys]
 version = "0.18"
 
-[dependencies.gobject]
-package = "gobject-sys"
+[dependencies.gobject-sys]
 version = "0.18"
 
 [dev-dependencies]
@@ -69,6 +66,8 @@ v2022_5 = ["v2022_2"]
 v2022_6 = ["v2022_5"]
 v2022_7 = ["v2022_5"]
 v2023_1 = ["v2022_7"]
+v2023_8 = ["v2023_1"]
+v2023_11 = ["v2023_8"]
 
 [lib]
 name = "ostree_sys"
@@ -84,10 +83,12 @@ license = "MIT"
 links = "ostree-1"
 name = "ostree-sys"
 repository = "https://github.com/ostreedev/ostree-rs"
-version = "0.14.0"
+version = "0.15.0"
 edition = "2021"
+
 [package.metadata.docs.rs]
 features = ["dox"]
+
 [package.metadata.system-deps.ostree_1]
 name = "ostree-1"
 version = "0.0"
@@ -232,3 +233,9 @@ version = "2022.7"
 
 [package.metadata.system-deps.ostree_1.v2023_1]
 version = "2023.1"
+
+[package.metadata.system-deps.ostree_1.v2023_8]
+version = "2023.8"
+
+[package.metadata.system-deps.ostree_1.v2023_11]
+version = "2023.11"
-- 
2.30.2